summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authort895 <clombardo169@gmail.com>2023-12-11 02:47:32 +0100
committert895 <clombardo169@gmail.com>2023-12-12 23:25:37 +0100
commitca5b135ddfce90da05c149bd0b89befd3a59d256 (patch)
tree1b4a766bf58d4dd327b4998d47600a5cd8f623d1
parentandroid: Add JNI initialization information for Game class (diff)
downloadyuzu-ca5b135ddfce90da05c149bd0b89befd3a59d256.tar
yuzu-ca5b135ddfce90da05c149bd0b89befd3a59d256.tar.gz
yuzu-ca5b135ddfce90da05c149bd0b89befd3a59d256.tar.bz2
yuzu-ca5b135ddfce90da05c149bd0b89befd3a59d256.tar.lz
yuzu-ca5b135ddfce90da05c149bd0b89befd3a59d256.tar.xz
yuzu-ca5b135ddfce90da05c149bd0b89befd3a59d256.tar.zst
yuzu-ca5b135ddfce90da05c149bd0b89befd3a59d256.zip
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/MemoryUtil.kt4
-rw-r--r--src/android/app/src/main/res/values/strings.xml1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/MemoryUtil.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/MemoryUtil.kt
index 9076a86c4..0b94c73e5 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/MemoryUtil.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/MemoryUtil.kt
@@ -27,13 +27,13 @@ object MemoryUtil {
const val Pb = Tb * 1024
const val Eb = Pb * 1024
- private fun bytesToSizeUnit(size: Float, roundUp: Boolean = false): String =
+ fun bytesToSizeUnit(size: Float, roundUp: Boolean = false): String =
when {
size < Kb -> {
context.getString(
R.string.memory_formatted,
size.hundredths,
- context.getString(R.string.memory_byte)
+ context.getString(R.string.memory_byte_shorthand)
)
}
size < Mb -> {
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index cd5571aa9..50879b3a3 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -414,6 +414,7 @@
<!-- Memory Sizes -->
<string name="memory_byte">Byte</string>
+ <string name="memory_byte_shorthand">B</string>
<string name="memory_kilobyte">KB</string>
<string name="memory_megabyte">MB</string>
<string name="memory_gigabyte">GB</string>